Merge pull request #790 from reaperhulk/098b-sigh

0.9.8b support