Implement CSTAnalyser fixing #4