Fixed the issue #1.

Please merge this branch back into dev, and then delete this branch, I'm done with it.  Thanks.