Merge pull request j5int#1 from matthewhampton/master

Merging the changes that we have made over the last couple of years with the upstream project code