IM-2039
Merge pull request #7 from Nukic/master

IM-2039