Merge pull request #13 from GotoLink/master

Update to 1.6
Merge remote-tracking branch 'upstream/master'