Update setup
Merge pull request #1 from oeon/master

Update setup