Merge pull request #72 from jules32/master

working to debug TR, NP