fixed rest, thanks to @b0oh
Merge branch 'master' of git://github.com/5HT/n2o