updated 1/15/2013
Merge pull request #3 from Jeanie4git/master

Jeanie's last version.