Fixed single quotes issues / 1.0.3