reflect n2o changes + dev styles
Merge pull request #21 from doxtop/master

reflect n2o changes + dev styles