Merge pull request #19 from gcbrueckmann/master

Add (optional) support for non-standard entry types
ENH: support for non-standard entry types