Added Handlers for commandline and incomming connections and added basic functionality
Merge origin/master