Commented out version check in some parts.
Merge remote-tracking branch 'origin/master'