Updated short hand properties in #74, Attached interdiff for same.