Issue#84 lend return edit

Resolves issue #84.
I bet there will be some merging conflicts with my pull request for issue #75. If you can not / do not want to merge them, just accept one of my request and i will handle the merge issues with the other.