merge setup
Merge pull request #1592 from ethomson/merge_setup

merge setup