Merge pull request #545 from M2Ys4U/font-awesome