Revert "Bringing in latest dev changes"
Merge pull request #2 from jkatzer/revert-1-master

Revert "Bringing in latest dev changes"