closes #154
Merge pull request #159 from mikedao/bug_fix

closes #154