IM-2262
Merge pull request #28 from Nukic/master

IM-2262