Merge pull request #1006 from lynnaloo/master