Merge pull request #23 from kefirfromperm/master

Merge all latest changes.