Revert "Revert "Merge pull request #2 from Jesterovskiy/new_branch""

This reverts commit aea862c074a93afe02b2289d822fb7bc29c1150c.