Commits for Issue #12

See #12