Merge branch 'merge-master'
refs #2. add some channgelog.
Merge pull request #7 from jcrom/master

merge with trunk