finished
Merge pull request #26 from ultrabook/Randy's-new-code

finished