closes #1 and closes #2
Issue 1 was resolved in 20245a9bcd70173c0eb24277b58bf8499070d64a