Ported #14 to Eclipse branch.