Nate

Merging Nate branch to master.