some stuff
Merge pull request #18 from ozayyad/name-change

some stuff