merging master
fixing brians booboo