Added version information
Merge branch 'release/master'