Merge branch 'release/0.6.0'
tabs -> spaces in all *.js files
Merge branch 'pr/39' into develop