Fixed ALLLLL the bugs
Merge branch 'master' of https://github.com/TeamFauna/testing