Release30: Merge pull request #22 from jammycakes/master

Tagging the latest master codebase before new development work begins.