done branch
Merge pull request #2 from iavor78/branch-A

done branch