v1.0.0 Applied fixes from v0.7