Update to 1.6.7
Merge pull request #248 from xion87/patch-1

Update to 1.6.7