Make the example better and fix #54