rename class
use protected, add set methods
rm html and echo
fix final
v2-beta
Merge branch 'develop'