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

closes #105