Merge pull request #4 from homaxweb/dev

Подправил код
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge remote-tracking branch 'origin' into dev