Minor fixes, and update version to 0.1.5.797