Updated source code and .jar file