Merge pull request #1 from Jire/master

KIIIIIIIID