Merge pull request #16 from jstty/release-candidate

merged in changes from develop
Merge branch 'master' into release-candidate
Merge branch 'release-candidate' into develop