CST-272
Merge pull request #20 from Nukic/master

CST-272