Fix #61
Fix #55
Merge