Merge pull request #7 from topicusonderwijs/master

NPE when mapping Map<String, List<MyType>>
use superclasses on objectfactory lookup