More r.js friendly
Merge remote-tracking branch 'upstream/master' into r.js
Fixed case
Merge pull request #39 from korczis/r.js

R.js