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

IM-2039