3.1 Config compatibility
Merge pull request #20 from cam-findlay/patch-1

3.1 Config compatibility