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

CST-559