Fixes

Fix #29
Fix #136