Improve config parsing
Update Readme