Getting closer
Done!
Done again!
Done again again!
Bump to version 1.3.0 and merge in refactoring