Rearrange naming for gem-like patterns
Merge pull request #1 from hunner/dev

Looks good.