cleared beta6 warnings
merged in master