Merge pull request #1 from rostikoff/master

v 1.1