Small fixes
Merge branch 'master' of https://github.com/popcorp/whoiz
Small fixes