Merge pull request #22 from mkatanski/master

tag
Some improvements