Few changed in templates and avatars
Fixed problems with code
Merge pull request #10 from dpolcyn/bug_2637

Bug 2637