Merge pull request #2 from Zash/master