changed enum implementation to NS_ENUM type
Merge branch 'release/0.5.3'