Merge pull request #5 from pannellr/master

merge please