commit to get stiege's changes
Merge branch 'master' of https://github.com/kevinpirolt/OlympusStoreNew.git
very... very small changes