- Merging working code from development branch into font-awesome branch