Major touches
Merge pull request #8 from adrianitech/develop

Major touches