fixes #58 and fixes #59
fixes #58 and fixes #59
fixes #58 and fixes #59
fixes #58 and fixes #59
fixes #58 and fixes #59
fixes #58 and fixes #59