Merge pull request #11 from Academic-KevinRobayna/development

Third Version