Add extension support
Merge pull request #40 from egeloen/f-extension

Add extension support