Merge pull request #15 from budjb/development

Release 1.2.0.