Merge branch 'master' of https://github.com/t20100/pymca
Visual Studio 2008 compatibility.