Merging in changes from multiple issues

Changes for #1, #2, and #6 included