logbook 07/06
Merge branch 'master' of https://github.com/TegarMario/PTM