Hotfix for commit code accidentally left in
Fixed conflicts
Merge pull request #195 from Webcraft-Myplanet/UF-333

Hotfix for commit code accidentally left in