Updated comments about version dependency
Removed non-specific file - replaced in an earlier commit by the same file with a more specific name
Updated from stash the changes made earlier.
Initial merge was unsuccessful and broke compilation of the code. This attempt re-adds the changes made by the initial merged branch, but still compiles as the changes were added more carefully.