Bug Fixes

Fix #10
Fix #7