3/2/2014-conf

add settings