added new functionality
removed obsolete functions
mostly beautification
Merge pull request #2 from oat-sa/master

recent updates