Merge pull request #80 from easyaspi314/master

Fix my mistakes.