Improved

Improved some code lines and added demo file