Improved py2exe compatibility
Merge branch 'master' of https://github.com/dschreij/Datamerger