Update based on javazab's updates
Merge pull request #15 from EasonLiao/master

Update based on javazab's updates