Jmwhicke

Hopefully updating master branch (merge) with jmwhicke branch.