lens and tests
Merge pull request #459 from buzzdecafe/lens

lens and tests