Comments on @goodhabit's PR #15 fix, adds additional tests. Resolves #16