Refactor and tidy up
Add @dfellis to contributors
Bump version