this closes #35
Merge pull request #55 from eprogramming/master

this closes #35
Merge remote-tracking branch 'upstream/master'