Merge pull request #81 from chrisshayan/Release8

Release8
Merge commit '463db9db57db746a0a041c16e02c53bc4edbd690'