Fix of my mistakes - now all features should be commited
Authored by: phommmm@gmail.com 2012-05-24
Parent: [r24]
Child: [r26]