Merge pull request #47 from xschildw/develop

Merge changes from release-1.7