upd str
Merge branch 'master' of https://github.com/ChristianDen/fx.js