Updating to v1.0.1, minor tidy up of code & using other v1.0.1 jars