Pulling in config from master branch
Merge branch 'dev' of github.com:TimeFinders/YAExS into dev