Merged work on Lightweight Java & NameFix extensions with original repository