Bug Fixes
Merge branch 'master' into BugFixes
Merge pull request #14 from Webcraft-Myplanet/BugFixes

Bug fixes