Fix setup script
Merge branch 'development' of github.com:ckolek/python-libs into development