Converted to Tycho (Fixes #3)