Merge branch 'master' into Release4
Merge pull request #24 from chrisshayan/Release4

Merge branch 'master' into Release4