Merge pull request #152 from hugovk/patch-1

Python 3.6 is out