Merge pull request #102 from gavinlaking/twerks

Cleanup and minor enhancements.
Bump gem to version 0.2.5.