Update to 0.1.8 and add comments