BUG: fixes #290 and #296
BUG: sitebase not honored, thanks @antgonza
Merge pull request #301 from wasade/issue_290_296

BUG: fixes #290 and #296