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

this closes #33