Baystation sync as of 27th November 2014
Merge pull request #8 from HypatiaStation/master

Baystation sync as of 27th November 2014