merge changes from master fork

oct 5