Merge pull request #2 from myHelloWorld/develop

Develop: merge Cecil's change into NIGHTLY