CST-671
Merge pull request #33 from tomaszrondio/master

CST-671