Add Martin Büttner's initial solution