Merge pull request #33 from belindahare/master

fine tuning