Merge pull request #8 from Japh/master

Update to v1.6 with misc bug fixes