Lazy code amend
AutoTests phase 1 - done!
Merge branch 'master' of git@github.com:tmkctm/LJ.git