initial commit
path fixes & tests
Merge pull request #1 from erosdome/master

initial commit