Fix #13 + progress for #85