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

CST-559