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

style and usage changes, nothing huge