merge.
Merge branch 'joao' of https://github.com/tzuohann/MASTER into joao
merge.
Merge branch 'joao' of https://github.com/tzuohann/MASTER into joao
Merge branch 'joao' of https://github.com/tzuohann/MASTER into tzuo
Working on period