Update setup
Merge pull request #1 from bbbjr2013/master

Update setup