this closes #21
Merge pull request #33 from eprogramming/master

this closes #21