Changes on Fork

Import changes from master fork.