To reflect latest PR

Shouldn't require any more updates after this.
Merge pull request #8 from a5mith/patch-6

To reflect latest PR