sort out the paths
Merge pull request #29 from kkronenb/master

sort out the paths
sort out the paths
Merge pull request #30 from kkronenb/master

sort out the paths