this closes #1
Merge pull request #2 from eprogramming/master

this closes #1