Improved installation and configuration process - Check in 6 - 08082013