some correction
some correction
Added error message render
Merge remote-tracking branch 'origin/master'
Merge pull request #2 from EvilDmitri/1

1