Update setup
Merge pull request #14 from oeon/master

Update setup