Merge pull request #1 from DraZoro/master

First pull request first proposal
TODO