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

IM-2375