Version 1.1, Add custom-demo