Merge pull request #12 from budjb/development

Version 1.1.4