changes to simple master regarding documention and naming conventions