Changes as per issues on git
Merge github.com:afzallakdawala/tours