Merge update for rnathanday trello 71

An update of pull 647 to resolve trivial merge conflicts.