Merge branch 'hotfix/0.6.5'
Adding root to locals.filename (Fixes #10)
Merge branch 'hotfix/0.6.6' into develop