Finalizing v0.1.7