Merge pull request #16 from erikchalmers/master

Schedulehandler tom constructor
Merge pull request #17 from erikchalmers/master

comm server & schedulehandler client update
Hotfix
Merge remote-tracking branch 'upstream/master'