added arafi mapping
improvements
Merge branch 'master' of github.com:khayk/mygithub
...