Merge pull request #17 from mweastwood/improvements

Interface Changes