M's comments
incorporating some comments from Ichiro Hasuo
incorporating some comments from Ichiro Hasuo
some recent updates
Merge branch 'merge-with-tlca'
taking some advice from Ichiro Hasuo
some small changes