laser50/Baystation12 — pull request #1 by laser50 (2014-05-07 08:51:53+00:00)
Title: Dev

Merging these two, hope it'll work as I want it to.