Merge pull request #664 from micmac1/bsipvid