Feature

Fixes issue #1 
Closes issue #2 
Resolves #3