Merge pull request #15 from roidelapluie/master

several improvements
Merge remote-tracking branch