changes
updated tests
Merge branch 'master' of git:projects/sorcer