Added support for base URL change + two bugfixes
Merge pull request #9 from umajeric/master

Added support for base URL change + two bugfixes