Restored the files that were overwritten

Restored the files that were overwritten in the last merge.
Merge pull request #4 from CWGran/merge_fix

Restored the files that were overwritten