issue #1 completed, also updated build.xml