Bug fix and Added Demo File