Merge pull request #2 from iandavidwild/feature-enhanced_api

Feature enhanced api
Fixed names for classes.
Merge pull request #1 from aferenz/feature-enhanced_api

Fixed classes names.