enums should be ALL_CAPS
Merge remote-tracking branch 'origin/master'