CST-631
Merge pull request #29 from Nukic/master

CST-631