Merge pull request #3 from FF-NRW/master

build 63