Merge pull request #134 from timothy-volvo/master

Fix for pull request 132