Upgrades to v3.1
Merge pull request #16 from ricardoquesada/to_v_3_1

Upgrades to v3.1