Merge pull request #582 from bluewavenet/master