Namebug gefixed
Merge branch 'namebugfix' into development