Cleaned source code
Merge remote-tracking branch 'origin/feature-modloader' into development