Merge pull request #1 from annndrey/master