minor fixes
Merge pull request #16 from jessonfoo/michael

minor fixes