naming cleaned
naming cleaned
Merge pull request #14 from leader80/master

 Naming cleaned