Tweaks
Merge pull request #6 from adrianitech/develop

Tweaks