Merge pull request #400 from Heather/master