Merge pull request #139 from isflorin/master

Update
Update
fixed wkhtmltopdf
Update
Merge pull request #140 from isflorin/dev

Dev