Merge pull request #3 from FF-NRW/master

first working version
Merge pull request #6 from FF-NRW/nightly

Merge pull request #3 from FF-NRW/master