Merge pull request #1 from geostar1024/development

Development
Merge pull request #2 from geostar1024/master

Merge pull request #1 from geostar1024/development