61727 task commit
Merge pull request #24 from ivanstef/master

61727 task commit