Merge pull request #176 from jamesladd/master

Various Changes
Merge pull request #177 from jamesladd/master

Classpath and fewer statics change...
Modified scripts to start correct Class.