Update to master branch

Signed-off-by: Christoff Frazier <chf2013@med.cornell.edu>
Merge branch 'refs/heads/Branch2'