Progress
Merge branch 'develop' of github.com:thomasklemm/pluginGeek into develop