Merge pull request #68 from aogilvie/develop

updated version
re-versioned codebase