Revert "Revert "Merge pull request #14 from vlatkokaplan/branch3""

This reverts commit 42c914adfe8f5871ae98c89465b3ff59ef686d55.