this closes #36
Merge pull request #51 from eprogramming/master

this closes #36