Merge pull request #1 from geostar1024/development

sync development changes