Convert #defines to explicit type declaration for consistency
Fix docs
Merge pull request #361 from reaperhulk/define-to-int

Convert #defines to explicit type declaration for consistency