CST-614
Merge pull request #28 from Nukic/master

CST-614