Mashed commit

Fix #113
Fix #112
Fix #111
Fix #67