Converted to Tycho (Fixes issue #3)