Merge pull request #11 from Gabs00/dev

Dev