Merge pull request #978 from lynnaloo/master