bugfix projection
Merge branch 'dev'