2013.07.26 - changes to support local jar and debug main