fixes #50
bumping to next hotfix rev
merge from master

Merge branch 'master' into dev

Conflicts:
	pkg/DESCRIPTION