first bug 'fix'!
Merge https://github.com/BenDavidZ/areyouin