Skip to content

Address bugs

Address bugs #46