Merge pull request #5 from murrekatt/develop

Changed defines to enums.
Comment cleanup.
Function parameter naming changes.