Merge pull request #1 from RefactoringTools/master

put previously removed code back.
Merge pull request #55 from prowessproject/master

Merge pull request #1 from RefactoringTools/master