Fix #79 plus example code