Merge pull request #3 from pannellr/master

Pull master updates down
Merge pull request #4 from pannellr/pannellr

Merge pull request #3 from pannellr/master