Added changes necessary for single version control file.

I think this fixes several issues re #13