Merge pull request #44 from pannellr/master

updating rickey's branch
Merge pull request #46 from pannellr/pannellr

Merge pull request #44 from pannellr/master