Merge pull request #5 from pannellr/master

merge please
Merge pull request #6 from pannellr/pannellr

Merge pull request #5 from pannellr/master