Merge pull request #4 from budjb/development

Next beta release