major
Merge pull request #80 from alfaiataria/updates

major