Merge pull request #20 from opengm/master

update
manual merge
Merge pull request #10 from joergkappes/master

update from joergkappes including TRWS-changes