added two classes by 09
Merge branch 'master' of https://github.com/zenorgtest/zenorgtest