closes #40
Merge pull request #123 from mikedao/40

closes #40