Updated to fix bug and updated demo and readme.