Issue #14

Issue #13

Issue #11