Fixed path errors and removed obsolete code
Merge pull request #149 from nwinklareth/master

Fixed path errors and removed obsolete code