Addresses issue #136 and issues partially referenced in #134