0.0.6 - Handle paths in base URL
Merge branch 'release/0.0.6' into develop