fixed tickets #18,19,20,22
Merge branch 'master' of github.com:SOLA-FAO/clients