Added versioning support + added 'return' documentation (according to Inna Kalinina request)