Merge pull request #55 from chriswoerz/master

More interface coverage to facilitate testing.