Base path update 

Fixes #31