closes #44
Merge pull request #108 from mikedao/44

closes #44