Christoph Loibl closes #214