Merge pull request #1 from mattybeam/master

Put in f
Merge pull request #2 from mattybeam/master

Calculate VdoubleBar
Merge pull request #3 from CY-Chan/master

Make up to date with Johnny's