ticket:1. Modified according to comments
Merge branch 'master' of https://github.com/chupakabra/test