Fixed ticket #381
Merge branch 'master' of github.com:gestorpsi/gestorpsi
fixed ticket #381