Merge pull request #2 from myHelloWorld/develop

Develop: merge Cecil's change into Master
Merge pull request #3 from myHelloWorld/nightly

Merge pull request #2 from myHelloWorld/develop