Merge pull request #7 from aaronwinter/master

Fix for name display
setup
Merge pull request #2 from csu/master

Details in configuration