demo code merged into master