addresses #51
addresses #51
fixes #51
fixes #51
fixes #30
fixes #30