lachepaillet - closes #3