fixes #11, fixes #12
Merge pull request #13 from cirocosta/bug/proxy-w-base-path

fixes #11, fixes #12