Committed by Saurabh
Merged and added new files and a directory for demo