Merge pull request #1 from ludjac/testbranch

Bold TODO
Merge pull request #2 from ludjac/master

Merge pull request #1 from ludjac/testbranch