Merge pull request #7 from iwhitfield/master

Merging this awesomeness.