move back to single file, critical fix to idLens!
Merge pull request #11 from kolektiv/develop

move back to single file, critical fix to idLens!