Merge pull request #3 from pannellr/master

Pull master updates down