Merged Pull request #355 - thanks to @bibendi