Merge pull request #17 from jstty/master

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