Code
Merge pull request #80 from Nelsonfox/master

Code