simplified
Merge branch 'master' of github.com:EJIqpEP/whereareyou