updates to master 8/4/14