Little improvements
08.05.14 seminar version