fixed spec all green :D
Merge branch 'master' into refactor_js