Merge #28 by hoppfrosch