Broke out the configurations into config.properties instead of hardcoding it.
Merge remote-tracking branch 'origin/master'