Updated to latest version and added working demo