Merge branch 'develop'
removes unneded ^ in formatter