Addressed #48, please review