Merge pull request #60 from benjamg/develop

Changes for 4.0 support