Merge pull request #6 from alexsnaps/master

Back to 1.6 and using the 107 types as based types