Add more name output alternatives
Merge pull request #7 from OpenSiteMobile/master

Add more name output alternatives