Platform modifications
Merge pull request #14 from denissytenkov/calipso-integrated

Platform improvements