Merge pull request #127 from lukashaertel/master

Setup of new paths, velocity and settings
Fixed #114. This time hopefully doing the correct push command.
Merge remote-tracking branch 'upstream/master'