updated version number
error in regex expression for parsing @link
Merge branch 'master' into live/www