Version 1.1

Added more tests for completeness
Some tidy up in the extension class (not functional changes)