modularizing contd
Merge branch 'master' of https://github.com/tkonttil/terra_pytalk