just a private member modified
Merge branch 'master' of https://github.com/vighiosif/POSA-14
working version ... not sure it's completely correct
stuff changed...