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

This reverts commit 623af6ebf04a2b6f1333f44aed8bb5ea1352bb88.