Merge pull request #40 from nphilipp/develop--py3k-fixes