closes #148
Merge pull request #156 from mikedao/148

closes #148