Merge branch 'master' of https://github.com/tcr/rem-js