Former syntax is invalid in Python 3
Merge pull request #95 from thedrow/patch-1

Former syntax is invalid in Python 3
Merge branch 'master' into topic/pep8-style-fixes