CST-67 CST-616
Merge pull request #16 from Nukic/master

CST-67 CST-616