Iss71 etienne rebased

A rebased version of #73. Better git history.