More features (updated readme)