Merge pull request #425 from dean0x7d/accessors

Make the accessor interface more complete