Changed to use blocks callback
Changed demo
Fixed test
Update README