Merge pull request #5 from polachok/new