Slight modifications (v0.5.2)