work in progress
Changed to 1.0.3