Fixes #1
Fixes #1
Fixes #2
Fixed #3