Revert "Lehner Pull Request"
Merge pull request #26 from shawnlawson/revert-25-master

Revert "Lehner Pull Request"