Merge pull request #1 from aetherson/master

style and usage changes, nothing huge
Update
Update
Merge pull request #1 from hzsweers/master

merge upstream