A few fixes and removed keys
Merge branch 'original/master'
Merge pull request #2 from parnaudo/master

A few more fixes