Merge pull request #21 from tuncer/fixup

Fixups for #19