Merge pull request #17 from opengm/master

update from master
Merge pull request #18 from opengm/master

update from master
Merge pull request #102 from joergkappes/master

update