Merge pull request #352 from Alexpux/develop

Fix python 2 and 3 building.