Minor changes
Merge branch 'develop' of github.com:Stolz/Assets into develop