Build configuration and demo - merge from skusunam