Some cleanup
Merge remote-tracking branch 'upstream/master'
Merge pull request #127 from lukashaertel/master

Setup of new paths, velocity and settings