Merge branch 'master' of github.com:5HT/n2o

Merge branch 'master' of github.com:5HT/n2o