Add a basic version check
Merge remote-tracking branch 'upstream/master'