Error Enum steamlined
Merge origin/master