Staging changes

Waiting state for later combine with server side
implemented error handling and recovery
Merge remote-tracking branch 'origin/master' into gh-pages
Fixed forgot to stage my fixes