Merged Tycho into Master

*Fixed merge problems
*Corrected Tycho's spelling