Merge branch 'development'
Added better error handling
Remove socket disconnect event handling and add booted handler
Merge branch 'master' into development