Fixed: two small memory and resource inefficiencies.
Merge branch 'master' of https://github.com/toinehartman/Routeplanner