Merge pull request #1 from k21/master

solution for p5