Updated setup
Merge pull request #3 from JBEI/dev

Updated setup