Working
Merge branch 'develop' of https://github.com/axsauze/projectelephant into develop