IM-2375
Merge pull request #22 from Nukic/master

IM-2375