fix names
Merge pull request #9 from EdmonL/fixnames

fix names, fixes #7