Merge pull request #161 from mfunk/master

Updates and fixes for V&R tools