enum
Merge pull request #68 from CircleCode/3.2/enum

enum
new RESET options

review wsh
Merge pull request #70 from Eric-Brison/wsh

new import RESET options