Updated Documentation, and added method to generic.py