Merge pull request #37 from lloydmeta/feature/2.11.0_support

Support for 2.11.0
Merge pull request #38 from lloydmeta/master

Merge pull request #37 from lloydmeta/feature/2.11.0_support