Merge pull request #100 from rosslagerwall/access-improve