Fixes #2 

This Pull Request fixes issue #2