refs #820
refs #821,823
Merge branch 'master' of git@github.com:RonBe/loan.git