Merge pull request #4 from adeven/development

version 1.4