Fixes #10
Fixes #15
Fixed #15 and #10
Fixed #11