2nd Pull Request.  fixes #3