Merge branch 'develop'
Merge branch 'develop'
update README.md, cabal.