Merge pull request #1 from fisharebest/master

master update to 1.6