Merge pull request #37 from opengm/master

update from opengm:master
bugfixes for windows - thanks to Javier Montoya
Merge pull request #150 from joergkappes/master

 bugfixes for windows