Issue #33 Fixed (Add Info)