Merge pull request #41 from belindahare/master

fixed active