updates from testing
Merge branch 'master' of https://github.com/kimhagen/parks