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

re-versioned codebase