Pull request to fix bandwidth bug in issue 597

Have added a simple flag to see if a user bandwidth is given, and if so just return this instead of computing a new one.

This is in relation to issue #597