Fixed merge conflict
Added has username policy
Resolved conflict
Merge pull request #6 from RWOverdijk/master

cleanup and finish