Fixes #370
Merge branch 'router-static-file-fix'