Final check of this one.
Merge pull request #108 from karinlag/2013-05-krakow

Final check of this one.