V1.0.5: based on your feedback: