Merge pull request #7 from mweastwood/improvements

Type stability fixes and more tests