Merged and closed #41