updates
Merge branch 'master' of https://github.com/nickreich/BiP
Merge branch 'master' of https://github.com/nickreich/BiP