Merge pull request #6 from GeminiCode/dev

Dev
Merge pull request #7 from GeminiCode/master

Merge pull request #6 from GeminiCode/dev