Merge pull request #2 from myHelloWorld/develop

Develop: merge Cecil's change into develop from nightly. This happens because NIGHTLY was created with features while DEVELOP does not. This should not happen, since DEVELOP should always have latest change.