Merge pull request #22 from zpbx/dev

Tiny optimizations.