closes #144
Merge pull request #157 from mikedao/143

closes #144