Rebases #70 against master