Closed #217
#217 Forgot style
Merge branch 'feature-loaders' into dev