update
merge conf
Merge pull request #2 from gbbr/doc

update