BVAL-480

Based on pull request #14