Merge pull request #625 from bluewavenet/master