ticket#5  - fixes by feedback
ticket#5  - fixes by feedback