Merge remote-tracking branch 'upstream/master'

 merging
Merge remote-tracking branch 'upstream/master'

Merging with hwilson master
Merge pull request #8 from echen027/master

merge conflicts