Changes made by Svetozar Toskov (s.toskov@abv.bg).
Merge branch 'master' of https://github.com/stoskov/test4.git