Merge pull request #67 from phuonghuynh/master

Release8
Merge pull request #68 from chrisshayan/Release8

Release8
Merge commit 'c81dd56faf38258259ca13381135afb1c2563c78'