Merge pull request #5 from Johnmalc/master

2.11