Adding necessary files for demo
Updating code with error fixes and update JAR