Fixed type error that caused issues on GHC 7.4
Added 'un'
Merge branch 'master' of github.com:ekmett/lens