re-versioned codebase
Merge pull request #69 from aogilvie/develop

re-versioned codebase