Added new stuff from my ready-made nanoc