Merge pull request #171 from aimozg/master

Whoops, this was a stupid bug on my part.