Addressed #17, please review