Revert "Small updates"
Merge pull request #2 from doubledead/revert-1-Dev

Revert "Small updates"