Master - fixed bugs