Fixing some interface inconsistencies.
Merge pull request #4 from einhverfr/master

Fixing some interface inconsistencies.