Merge pull request #1 from LCPQ/master

merge