Closses #11 and marked marked previously closed issues: closses #15 and closses #16.