Merge pull request #540 from grnbrg/master