Added extension support
Merge pull request #5 from blha303/patch-1

Added extension support