CST-502
CST-494
CST-479
CST-483
CST-507
CST-483
merge
Merge pull request #13 from tomaszrondio/master

fixes