Merge pull request #10 from pethers/master

Custom naming extension pre 0.6.0 behavior.
Issue #10.
Merge remote-tracking branch 'upstream/master'