Fields, propperties and methods added
Merge branch 'master' of https://github.com/cascer1/PT12.git