Change compatibility to Java 7 since Java 6 is deprecated.
Make CreatorMap not be a Map at all.
Merge pull request #91 from SuperJugy/test

Fixes #93