better extensibility
Merge pull request #3 from matej116/patch-3

better extensibility