Fix #11
Fix #12