more styling
Merge branch 'master' into presentsocket
Merge pull request #38 from KyleW/presentsocket

more styling