Omega branch 

closes #6