updated for new enums, fix all dependencies to specific versions
resolve conflicts
Merge pull request #2 from jdegoes/ready/new-enums

updated for new enums, fix all dependencies to specific versions