1x fix, 1x new feature, 1x readme

Hello,

Here is a fix for #1, #2 and #3