Noah branch

Merged Noah branch with master