Accidently clobbered bug fix.
Merge pull request #77 from geota/master

Clobbered bug fix