closes #112
Merge pull request #134 from mikedao/review

closes #112