Merged and closed #43 — Merged and closed #44