added pypi_upload make command
fixed tests
fixed docs
Merge branch 'develop'