Fix base_path setting
Merge pull request #858 from yasar11732/master

Fix base_path setting (#856)