Merge pull request #12 from galaviz/master

abc locations
Beautify Code
Merge pull request #40 from yalmasri/master

Beautify Code