readme
readme
Merge pull request #2 from txthinking/master

merge update from upstream