Merge pull request #62 from ChildrenOfUr/dev

Dev
Merge branch 'dev'
fix problem where username is sometimes null