closes #111
Merge pull request #133 from mikedao/111

closes #111