Merge pull request #359 from bluewavenet/patch-4