Update according to ticket #10403.

Someone more familiar with this formatting please verify my changes :)
Merge pull request #16 from wmamrak/patch-1

Update according to ticket #10403.