added some improvements
Merge branch 'master' of github.com:biemond/soa_tools