New year!
Merge pull request #1392 from MaciejCzyzewski/patch-1

New year!