work dammit
Merge branch 'develop' of https://github.com/MobliMic/FindMeAThing into develop