Merge pull request #103 from pallih/master

Fix copy/paste error
Fix copy/paste errors part two