made several changes.
Merge branch 'master' of ssh://github.com/galicae/tina