CST-559
Merge pull request #8 from Nukic/master

CST-559