Merge master with development

Doesn't work properly in js
-90%360
-90 (instead 270)