updated config
updated 2014-11-21