Merge pull request #23 from scasBot/beta

Beta
Fixed bug in merge
Merge branch 'master' of https://github.com/scasBot/i4