Merge pull request #152 from motom001/development