Construction 4 merge 2

Please remove swt.jar from your build path.