Fixed some bugs and new feature
Now it' s including images as well into the jar