this closes #10
Merge pull request #23 from eprogramming/master

this closes #10