improved extensibility
Merge pull request #8 from meysholdt/master

improved extensibility