Issue #58 Resolve Conflict
Issue #58 Resolve Conflict
Issue #58 Resolve Conflict 3
Issue #57 Add Params