Merge pull request #365 from tstellanova/update_version_info

Update version info
clean references and update version number