Revert "revert changes to master"
Merge pull request #4 from bmtreuherz/revert-3-master

Revert "revert changes to master"