Merge pull request #91 from mariogiov/devel

A bunch of coding and restructuring I did on an airplane
minor changes
Merge ngi_devel