- small refactoring
 - fixed bug where illegal WayElements are added to the path
Merge remote-tracking branch 'origin/master'