closes #106
Merge pull request #109 from mikedao/106

closes #106