Merge pull request #21 from Miauw62/master

More tweaks