Merge pull request #17 from ozayyad/name-change

Name change
some stuff