Merge pull request #292 from nicmcd/master