Merge pull request #44 from pannellr/master

updating rickey's branch