fixed various copy&paste bugs
Merge pull request #13 from 0x7f/master

fixed various copy&paste bugs