Merge pull request #45 from Hasimir/master

New variants and some minor fixes.