closes #46
Merge pull request #105 from mikedao/46

closes #46