Fixes #10 , Fixes #11 , Closes #10 , Closes #11 .