Merge pull request #3 from ktoley/master

merge please