Resolved #49
Resolved #48