Merge pull request #1 from Jire/master

KIIIIIIIID
Merge pull request #7 from Jonatino/master

Merge pull request #1 from Jire/master