Issues on 24 dec solved
Merge remote-tracking branch 'remotes/origin/issues_on_24_dec'