Merge branch 'develop'
Merge pull request #42 from pythonlessons/develop Fix issues with all files in setup.py