Merge pull request #21 from budjb/development

Release 1.0.2.