lucasviola Merge pull request #4 from katmutua/master