Merge pull request #1 from Baystation12/dev

Merge
Merge branch 'dev' of https://github.com/Jarcolr/Baystation12 into dev
Merge branch 'dev' of https://github.com/Jarcolr/Baystation12 into dev