Makes changes to several files.
Merge pull request #3 from kswis/master

More of it's been changed.