bug/type fixes.
Merge branch 'master' of github.com:RefactoringTools/wrangler