Univeral load optimalization
Merge remote-tracking branch 'origin/master'
Formatting code with eclipse code formatter
Small template improvments