fix Merge Conflict, pep8 format
Merge pull request #1 from bingwen/dev

Because codes onto git has been from automatic processing of <code>python setup.py sdist</code>. Next time I will upload only the main codes directly. Thank you, my friend.