Resolves issue #1
Fixes issue #3