Merge branch 'master' into Main-Server
Merge pull request #22 from VirtualFlyBrain/master

Bring main server up to date with master
Merge pull request #23 from VirtualFlyBrain/Dev-Server

Dev server
Merge pull request #24 from VirtualFlyBrain/Main-Server

Main server
Merge pull request #25 from VirtualFlyBrain/master

Push v2.0.0 to dev server