iJackUA Merge pull request #22 from SpeksForks/master