added --version flag
merge commit