Merge pull request #1 from RefactoringTools/master

put previously removed code back.