modified locally with svn
no message
Merge pull request #1 from iavor78/branch-A

Branch a - ok