All the Fixes
Merge pull request #286 from pigalot/master

All the Fixes