Ready
Merge pull request #13 from An2kataluna/master

Ready ^_^