Add another constructor for hardcoded setting file name
Merge branch 'upstream/master'