Merge pull request #18 from mruffalo/master

Fix #17 in both Python 2 and 3