Fixes #6
Fixed #3