this closes #47
Merge pull request #64 from eprogramming/master

this closes #47