Updated demo source codes.
Added new headers