Merge pull request #2 from kuroskin/master

Master