Updated to latest version and added demo