finished copy alanfluder
Merge pull request #53 from afluder1/master

finished copy alanfluder