Fixed Issues #114 & #135 - Add path resolution and autosyncing
Merge pull request #147 from gideonthomas/issue114

Fixed issue #114 and #135