Addressed #52, please review