Merge pull request #252 from michalbednarski/ltrace-1