fixes #83 and fixes #80
fixes #83 and fixes #80
fixes #83
fixes #78
Merge pull request #86 from royrusso/_98

 98