Merge pull request #2 from ltiao/master

nightly pull
Merge pull request #2 from sparbz/master

Merge pull request #2 from ltiao/master