cleaning code and adding support for FontAwesome, issue #1
fixing features