Fix #26
Fix #11
Fix #24