Added: support for two options of wkhtmltoimage that were missing (use-xserver and enable-smart-width)
Merge branch 'master' of github.com:0livier/snappy