Update to version 1.6, Fixes issues #9 and #6, Helps with issue #7