Revert "Revert "Development into Master""
Merge pull request #3 from RaphaelTurtlePower/revert-2-revert-1-development

Revert "Revert "Development into Master""