method names updated
Merge pull request #32 from Gegga87/master

method names updated