Added other_names support and various bug fixes.
Merge branch 'my'