Made api consistent
Merge pull request #52 from OpenGeoscience/minor_api_fixex

Made api consistent