Merge pull request #1 from amplab/master

merge