Merge pull request #675 from dspicher/master