Add setup.cfg file
Merge branch 'develop'