More refactoring
Merge branch 'master' of https://github.com/marembo2008/teh.git