Merge pull request #1 from jsla/master

courtesy pull request for breakfix