Updating changes from demo/basic branch.