Merge pull request #99 from Aurorastation/master

update
Merge pull request #101 from Aurorastation/development

Merge pull request #99 from Aurorastation/master