Merge pull request #1 from mesmichael/master

Local Branch Update
Imported Jar
Merge pull request #2 from SamCroswell/master

Various Fixes