Updated version
Merge pull request #1 from dhyee/Donna

trying to merge...
Merge pull request #2 from dhyee/master

trying to merge pt. II