Merge pull request #105 from chrisshayan/Release11

Release11
Merge commit 'bbc3b15cb02b6de373f90f12639ddede193b9478'