Bugfix
Merge branch 'turk' into develop