Made all methods non-static where possible, tidied up extension process, small fixups
Merge branch 'master' of https://github.com/KodrAus/eswp