Merge pull request #2 from PinkBuffalo/api_refinements

Api refinements