Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte int...

...o develop