UPDATE: upgrade functionality to 3.1
Merge pull request #2 from stevie-mayhew/3.1

UPDATE: upgrade functionality to 3.1