Merge pull request #702 from NiLuJe/master

Some more Kindle tweaks