Issue #14 - Updated User helper