Merge stuff from python-exercises