small refactoring of typeserializer initialization
Merge branch 'master' of https://github.com/emilsjolander/sprinkles
added @NotNull annotation fixes #27