Merge pull request #1 from cloudaice/master

update
update config file
update readme