fixed to fit new convention
Merge branch 'master' of https://github.com/morgante/travelwatch
fixed to new convention