Resolved #83
Resolved #81