Merge branch 'master' into settings

diff --cc diaspy/__init__.py
index c12c783a072ed3d5a13d0d37ef7eafc04349940e,d62eb86da18527bdd4e12892a1fd8330705cb6f6..08b5fae2ead3e90cbbf3dace29fd3c8ca36d6fed
--- 1/diaspy/__init__.py
--- 2/diaspy/__init__.py
+++ b/diaspy/__init__.py
@@@ -4,7 -4,6 +4,7 @@@ import diaspy.streams as stream
  import diaspy.client as client
  import diaspy.people as people
  import diaspy.notifications as notifications
 +import diaspy.settings as settings
  
  
- __version__ = '0.2.0'
+ __version__ = '0.3.0'