Made changes requested by Anna.
Fixed settings.
Merge pull request #3 from Malketh/master

Anna's requested changes.