Refactoring ex5 and ex6
Merge branch 'master' of github.com:sorcersoft/sorcer