Last minute changes
Merge pull request #287 from Vexatos/patch-2

Last minute changes