Bug fix
Merge branch 'masterfix' into dev