edit setup file
Merge branch 'master' of https://github.com/n00shie/fuzzy-octo-ironman