Merge pull request #33 from twiniars/master

fix
names fixes
names fix'es
fix
fix