Merge pull request #30 from brettcannon/python-3.6

Support Python 3.6