Merge pull request #11 from tomaszrondio/master

fixes
CST-502