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

Revert "Revert "Merge updates from Baystation12""