Merge pull request #2 from SweBarre/move-filter

Made the IP-filter more "robust"
Merge branch 'master' into new-cache