Fix issue #14 (server side only, Android client should be updated also)