Readding Pull Request #14

This is the commit that was made when Pull Request 14 was closed.