Generalised the lenses
Merge pull request #3 from torgeirsh/master

Generalised the lenses