Merge pull request #5 from sforce100/master

1
v0.1
Merge pull request #8 from PlutoDyh/master

s