Added basic server functionality
Added basic server functionality
Merge remote-tracking branch 'runkel/master'