commit from vs2010
Merge branch 'master' of github.com:mareanoben/Enogex