Reverted master to pre-pull req #8 and #9 status. These now reside in the `dev` branch.