Merge branch 'master' into devel
Make sure the errors from mocha are not swallowed
Better error logs
Added wait and promise methods for server and client
Merge branch 'devel'
Bumped package version