UG 17-03-2012
Merge https://github.com/michal-at-git/python-training