Adds ext
Fixes merge conflicts
Merge pull request #13 from rjbernaldo/ext

Ext