Merge pull request #105 from Austinh100/master

setup fix mainly