Jeremy2

Merging Jeremy's changes to master branch.