Added requested features
Merge pull request #67 from bflugon/herpaderpa

Added requested features