Merge pull request #1 from pannellr/master

Update pannellr.
Merge pull request #2 from pannellr/pannellr

Merge pull request #1 from pannellr/master