Fixes gh-13. Also added base-page