Adding my name.
Fixing things up.
Merge pull request #250 from shahv/fixup

Fixup