merging in changes made to jbm master branch.