Revert "Merge updates from Baystation12"
Merge pull request #4 from RBMNT/revert-2-master

Revert "Merge updates from Baystation12"