fixed bug and optimized iterations
Merge branch 'master' of https://github.com/MGM-KTH/travelguide