Merge master with development

(degree - 90) % 360