I think the plan for this repository was for the master branch to reflect the current release of the package (currently 0.1.2), with developments being merged into a branch with the name of the next release (currently 0.1.3-dev).

The master and dev branches have become out of sync, so I'll merge the master branch into the dev branch. To help avoid conflicts, my preference is for future development work to be done in project specific branches and then merged into the dev branch when ready.