Daniel h branch merge

merging my branch onto the master branch...hopefully.