Pull of updated master after merge of pull request 166 into old master. Pull request 166 just corrected a couple of lines that were causing our compiler at KU to issue a warning (see the pull request for details).

• Summary