displays
getuser fixes
merge fix
Merge pull request #32 from kweek/master

displays