ehanley commit
Merge pull request #14 from githubteacher/ehanleyfeature

ehanley commit