Merge pull request #7 from iwhitfield/master

Merging this awesomeness.
Merge pull request #1 from wluu/master

Merge pull request #7 from iwhitfield/master