added a possible enum replacement
Merge remote-tracking branch 'origin/master'