Merge pull request #11 from tzpandaman/master

Getting Aug 26 from Rongxin