Made some file changes to match V&R v2.102

Made some file changes to match V&R v2.102
Revert "Made some file changes to match V&R v2.102"

This reverts commit 2102dd9d76830a49ce1d09bfe2e9f17a0ffbf31e.
Changes to better match V&R v2.102

Changes to better match V&R v2.102
Merge pull request #57 from mfunk/master

Changes for V&R v2.102