#43: standarized the property names. Added documentation