Merged Din's, Michele's, Daniel's & Gustavo's. Leatest as of now. Feel free to pull but don't push any changes to master branch. Work on merging or something else.