Christoph Loibl closes #61