This closes out issue #12