Merge pull request #38 from gavinlaking/twerks

Minor additions.