updated configuration
Merge branch 'master' of https://github.com/patyogesh/FGRE-2014