Merge pull request #110 from chrisshayan/Release12

Release12
Merge commit 'ce0f1595e15fc9138042710f8ffd5402a55d0694'