Guidow to dict fix attempt2 (closes #105, closes #96)

completed manual merge for #105