Merged for initial release (v1.0)