Improved configuration and updated readme