Merge pull request #153 from motom001/development