Merge pull request #21 from yohny/master

itb and skolka improved
Merge upstream/master