Changed naming of super annotation attributes. Added further tests and javadoc.