Merge pull request #18 from budjb/development

Version 1.0.0