Revert "Revert "Merge updates from Baystation12""

Reverts RBMNT/RBstation2#4