Issue69

closes #69