Merge pull request #810 from bitlogica/master

use NS_ENUM and NS_OPTIONS