Fixed expanding config filename issue
Merging origin/master