added missing commits from #174