Addressed #35, please review