Fix #28
Fix #66