Merge pull request #1 from miku/master

updated README
Update setup.py
Merge remote-tracking branch 'ubleipzig/master'

* ubleipzig/master:
  Update setup.py