Ready to merge into the master branch... JEG