* demos updated to work with current development version.