unified convention
Merge branch 'master' of https://github.com/morgante/travelwatch