Updated setup
Merge pull request #4 from JBEI/dev

Updated setup