Added some goodies

Please, see commits bellow